From: Karl Heuer <kwzh@gnu.org>
Date: Sat, 14 Jun 1997 04:36:44 +0000 (+0000)
Subject: (readline): Terminate buffer properly when EOF seen.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~80835
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=5326c1d6879b987a9aa921ab49fda3421b54d18b;p=emacs.git

(readline): Terminate buffer properly when EOF seen.
Test for valid pointer before dereferencing it.
---

diff --git a/lib-src/b2m.c b/lib-src/b2m.c
index 88d0acd5cd8..2eb6a0354b8 100644
--- a/lib-src/b2m.c
+++ b/lib-src/b2m.c
@@ -211,12 +211,13 @@ readline (linebuffer, stream)
 	}
       if (c == EOF)
 	{
+	  *p = '\0';
 	  chars_deleted = 0;
 	  break;
 	}
       if (c == '\n')
 	{
-	  if (p[-1] == '\r' && p > buffer)
+	  if (p > buffer && p[-1] == '\r')
 	    {
 	      *--p = '\0';
 	      chars_deleted = 2;